From 37462725046443c1a390a0bfe3c67576f09cd335 Mon Sep 17 00:00:00 2001 From: Debian LibreOffice Maintainers Date: Sun, 10 Oct 2021 14:42:24 +0100 Subject: [PATCH] disable-java-in-odk-build-examples-on-zero-vm Gbp-Pq: Name disable-java-in-odk-build-examples-on-zero-vm.diff --- config_host.mk.in | 1 + configure.ac | Bin 515743 -> 516052 bytes odk/Module_odk.mk | 4 ++++ 3 files changed, 5 insertions(+) diff --git a/config_host.mk.in b/config_host.mk.in index efe5d54d10f..362ddb2c95f 100644 --- a/config_host.mk.in +++ b/config_host.mk.in @@ -321,6 +321,7 @@ export JAVAIFLAGS=@JAVAIFLAGS@ export JAVAIFLAGS_FOR_BUILD=@JAVAIFLAGS_FOR_BUILD@ export JAVA_CLASSPATH_NOT_SET=@JAVA_CLASSPATH_NOT_SET@ export JAVAINTERPRETER=@JAVAINTERPRETER@ +export JAVA_HAS_ZERO_VM=@JAVA_HAS_ZERO_VM@ export JAVA_HOME=@JAVA_HOME@ export JAVA_HOME_FOR_BUILD=@JAVA_HOME_FOR_BUILD@ export JAVA_SOURCE_VER=@JAVA_SOURCE_VER@ diff --git a/configure.ac b/configure.ac index a69d30b6a8e4d65893310d5863106fb92025843c..3c790cc44f9059f9e0856d140a8819152d50232c 100644 GIT binary patch delta 220 zcmbQgSN_U=`Gyw87N!>FEi9LFr*AyTA~*fOW@b(^FUK%PPrne?pnxD(AgPd9tWa8< znU}6ml98$qm0Faq5at`J$)$hd-!*(WbB wV&DEZmnEEWdQCAiCqKwhNTy6bn9mkE-9MFut$j^C3lOscG28Yv`Rt$b04%#n761SM delta 56 zcmcbzUw-~x`Gyw87N!>FEi9LFr+*A#Ro*U;&l1Ntz4H@m(DVf*EL`nR3s``d6^Plk KKP_N?p9cV(Xc!6r diff --git a/odk/Module_odk.mk b/odk/Module_odk.mk index 0d5fca58d2c..6bbe1e826e3 100644 --- a/odk/Module_odk.mk +++ b/odk/Module_odk.mk @@ -59,10 +59,14 @@ $(eval $(call gb_Module_add_check_targets,odk,\ ifneq ($(filter $(OS),LINUX MACOSX),) $(eval $(call gb_Module_add_subsequentcheck_targets,odk, \ CustomTarget_build-examples \ +)) +ifneq ($(JAVA_HAS_ZERO_VM),y) +$(eval $(call gb_Module_add_subsequentcheck_targets,odk, \ $(if $(ENABLE_JAVA),\ CustomTarget_build-examples_java \ ) \ )) endif +endif # vim: set noet sw=4 ts=4: -- 2.30.2